From 7331904137db2c07bea47936628fe7b866604a6a Mon Sep 17 00:00:00 2001 From: "arun.sharma@intel.com[kaf24]" Date: Thu, 23 Jun 2005 10:02:54 +0000 Subject: [PATCH] bitkeeper revision 1.1740 (42ba88cewc_4MMbiCLInZ8gEcgqwhQ) [PATCH] vmx-pit-reset2.patch A VMX guest can reprogram the same PIT channel twice. We should not create two ac_timers to handle this case. Signed-off-by: Edwin Zhai Signed-off-by: Arun Sharma --- xen/arch/x86/vmx_intercept.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/vmx_intercept.c b/xen/arch/x86/vmx_intercept.c index cd7e464904..e64b626d29 100644 --- a/xen/arch/x86/vmx_intercept.c +++ b/xen/arch/x86/vmx_intercept.c @@ -214,6 +214,14 @@ void vmx_hooks_assist(struct vcpu *d) /* load init count*/ if (p->state == STATE_IORESP_HOOK) { + /* set up actimer, handle re-init */ + if ( active_ac_timer(&(vpit->pit_timer)) ) { + VMX_DBG_LOG(DBG_LEVEL_1, "VMX_PIT: guest reset PIT with channel %lx!\n", (unsigned long) ((p->u.data >> 24) & 0x3) ); + rem_ac_timer(&(vpit->pit_timer)); + } + else + init_ac_timer(&vpit->pit_timer, pit_timer_fn, vpit, 0); + /* init count for this channel */ vpit->init_val = (p->u.data & 0xFFFF) ; /* frequency(ms) of pit */ @@ -248,9 +256,7 @@ void vmx_hooks_assist(struct vcpu *d) vpit->intr_bitmap = intr; - /* set up the actimer */ - init_ac_timer(&vpit->pit_timer, pit_timer_fn, vpit, 0); - pit_timer_fn(vpit); /* timer seed */ + set_ac_timer(&vpit->pit_timer, NOW() + MILLISECS(vpit->period)); /*restore the state*/ p->state = STATE_IORESP_READY; -- 2.30.2